Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:50:29 +0000 (14:50 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:50:29 +0000 (14:50 -0400)

Trivial merge